ChangeLog merge fix.
authorGlenn Morris <rgm@gnu.org>
Mon, 13 Dec 2010 17:26:01 +0000 (09:26 -0800)
committerGlenn Morris <rgm@gnu.org>
Mon, 13 Dec 2010 17:26:01 +0000 (09:26 -0800)
commit3a121df267ce86ac140bd9823877c513b2e2e20d
tree623cba6711a5812322f4a31f28ad6fbc8b438e08
parentfe4febd13d55cbecb91fd49e6c44375d525c17ba
ChangeLog merge fix.
etc/ChangeLog